build: Fix --without-selinux case
authorColin Walters <walters@verbum.org>
Sun, 2 Feb 2014 16:49:43 +0000 (11:49 -0500)
committerColin Walters <walters@verbum.org>
Sun, 2 Feb 2014 16:49:43 +0000 (11:49 -0500)
src/libostree/ostree-sysroot-deploy.c

index 69a2b7f4d46fa08485c4f76d26973cf660e87784..4da39a6286b131db1fc17f39cab3fdf5a626effb 100644 (file)
@@ -503,8 +503,10 @@ init_labeling_context (GFile                         *deployment_etc,
 static void
 ostree_labeling_context_cleanup (OstreeLabelingContext *secontext)
 {
+#ifdef HAVE_SELINUX
   if (secontext->hnd)
     selabel_close (secontext->hnd);
+#endif
 }
 
 static gboolean
@@ -545,6 +547,7 @@ selinux_relabel_dir (OstreeSysroot                 *sysroot,
 #endif
 }
 
+#ifdef HAVE_SELINUX
 static gboolean
 selinux_relabel_file (OstreeLabelingContext         *secontext,
                       GFile                         *path,
@@ -552,7 +555,6 @@ selinux_relabel_file (OstreeLabelingContext         *secontext,
                       GCancellable                  *cancellable,
                       GError                       **error)
 {
-#ifdef HAVE_SELINUX
   gboolean ret = FALSE;
 
   if (secontext->have_policy)
@@ -578,10 +580,8 @@ selinux_relabel_file (OstreeLabelingContext         *secontext,
   ret = TRUE;
  out:
   return ret;
-#else
-  return TRUE;
-#endif
 }
+#endif
 
 static gboolean
 selinux_relabel_var_if_needed (OstreeSysroot                 *sysroot,